Be more careful when calling g_propagate_error(). (#453365, Michael

2007-07-03  Matthias Clasen  <mclasen@redhat.com>

        * gdk-pixbuf-loader.c (gdk_pixbuf_loader_close): Be
        more careful when calling g_propagate_error().  (#453365,
        Michael Chudobiak)

svn path=/trunk/; revision=18357

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index a2f8a51a9d43da2d2a8e5d1fec49cf45c96d604b..66f0d40da85006d9f79350d90c94240717f71cd0 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-03  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk-pixbuf-loader.c (gdk_pixbuf_loader_close): Be
+       more careful when calling g_propagate_error().  (#453365,
+       Michael Chudobiak)
+
 2007-07-02  Matthias Clasen  <mclasen@redhat.com>
 
        * === Released 2.11.5 ===

diff --git a/gdk-pixbuf/gdk-pixbuf-loader.c b/gdk-pixbuf/gdk-pixbuf-loader.c
index d1721451c4d6667e6d343f4da261df75906267cb..130608fb3e7d29e32c926c7b1e6aad68f6150d80 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-loader.c
+++ b/gdk-pixbuf/gdk-pixbuf-loader.c
@@ -723,8 +723,8 @@ gdk_pixbuf_loader_close (GdkPixbufLoader *loader,
                         GError *tmp = NULL;
                         if (!priv->image_module->stop_load (priv->context, &tmp) || tmp)
                                 {
+                                        gdk_pixbuf_loader_ensure_error (loader, &tmp);
                                        g_propagate_error (error, tmp);
-                                        gdk_pixbuf_loader_ensure_error (loader, error);
                                         retval = FALSE;
                                 }
                 }